Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Игральные карты + механика к ним. #79

Merged
merged 8 commits into from
Nov 26, 2024
Merged

Игральные карты + механика к ним. #79

merged 8 commits into from
Nov 26, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Nov 24, 2024 •
edited by AwareFoxy
Loading

Описание PR

Добавляет колоду игральных карт, вместе с механикой для её использования. Карты можно переворачивать, перемешивать, раскладывать и складывать в колоды. Их можно купить в автомате безобидных развлечений.
P.S. Я не кодер, а оригинальный код на португальском языке блять, сделанный испанским кодером для бразильского сервера, так что если что сорян.

Почему / Баланс

Фан.

Технические детали

Портирована система игральных карт с rbertoche/space-station-14#104
Так же портирована доработка с new-frontiers-14/frontier-station-14#2038

Медиа

default.mp4

Список изменений

ЧЕЙНДЖЛОГЕРУ Спрайты колод карт процедурно генерируются в зависимости от расположения карт в колоде. Упомяни пж :3 - By AwareFoxy

🆑

  • add: Добавлены игральные карты. Их можно приобрести в автомате безобидных развлечений.

@Vonsant Vonsant requested a review from Morb0 as a code owner November 24, 2024 18:46
@github-actions github-actions bot added size/XL S: Untriaged S: Needs Review ПРу необходим ревью Changes: Sprites Changes: Localization Изменяет локализацию Changes: UI and removed S: Needs Review ПРу необходим ревью labels Nov 24, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 24, 2024 •
edited
Loading

RSI Diff Bot; head commit 8761352 merging into 744d490
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CorvaxNext/Objects/Misc/cards.rsi

State Old New Status
black_box Added
black_box_open Added
black_hand1 Added
black_hand2 Added
black_hand3 Added
black_hand4 Added
black_hand5 Added
black_joker Added
deck_black_empty Added
deck_black_full Added
deck_black_half Added
deck_black_low Added
deck_nanotrasen_empty Added
deck_nanotrasen_full Added
deck_nanotrasen_half Added
deck_nanotrasen_low Added
deck_syndicate_empty Added
deck_syndicate_full Added
deck_syndicate_half Added
deck_syndicate_low Added
nanotrasen_box Added
nanotrasen_box_open Added
nanotrasen_hand1 Added
nanotrasen_hand2 Added
nanotrasen_hand3 Added
nanotrasen_hand4 Added
nanotrasen_hand5 Added
nanotrasen_joker Added
sc_10_of_Clubs_black Added
sc_10_of_Clubs_nanotrasen Added
sc_10_of_Clubs_syndicate Added
sc_10_of_Diamonds_black Added
sc_10_of_Diamonds_nanotrasen Added
sc_10_of_Diamonds_syndicate Added
sc_10_of_Hearts_black Added
sc_10_of_Hearts_nanotrasen Added
sc_10_of_Hearts_syndicate Added
sc_10_of_Spades_black Added
sc_10_of_Spades_nanotrasen Added
sc_10_of_Spades_syndicate Added
sc_2_of_Clubs_black Added
sc_2_of_Clubs_nanotrasen Added
sc_2_of_Clubs_syndicate Added
sc_2_of_Diamonds_black Added
sc_2_of_Diamonds_nanotrasen Added
sc_2_of_Diamonds_syndicate Added
sc_2_of_Hearts_black Added
sc_2_of_Hearts_nanotrasen Added
sc_2_of_Hearts_syndicate Added
sc_2_of_Spades_black Added
sc_2_of_Spades_nanotrasen Added
sc_2_of_Spades_syndicate Added
sc_3_of_Clubs_black Added
sc_3_of_Clubs_nanotrasen Added
sc_3_of_Clubs_syndicate Added
sc_3_of_Diamonds_black Added
sc_3_of_Diamonds_nanotrasen Added
sc_3_of_Diamonds_syndicate Added
sc_3_of_Hearts_black Added
sc_3_of_Hearts_nanotrasen Added
sc_3_of_Hearts_syndicate Added
sc_3_of_Spades_black Added
sc_3_of_Spades_nanotrasen Added
sc_3_of_Spades_syndicate Added
sc_4_of_Clubs_black Added
sc_4_of_Clubs_nanotrasen Added
sc_4_of_Clubs_syndicate Added
sc_4_of_Diamonds_black Added
sc_4_of_Diamonds_nanotrasen Added
sc_4_of_Diamonds_syndicate Added
sc_4_of_Hearts_black Added
sc_4_of_Hearts_nanotrasen Added
sc_4_of_Hearts_syndicate Added
sc_4_of_Spades_black Added
sc_4_of_Spades_nanotrasen Added
sc_4_of_Spades_syndicate Added
sc_5_of_Clubs_black Added
sc_5_of_Clubs_nanotrasen Added
sc_5_of_Clubs_syndicate Added
sc_5_of_Diamonds_black Added
sc_5_of_Diamonds_nanotrasen Added
sc_5_of_Diamonds_syndicate Added
sc_5_of_Hearts_black Added
sc_5_of_Hearts_nanotrasen Added
sc_5_of_Hearts_syndicate Added
sc_5_of_Spades_black Added
sc_5_of_Spades_nanotrasen Added
sc_5_of_Spades_syndicate Added
sc_6_of_Clubs_black Added
sc_6_of_Clubs_nanotrasen Added
sc_6_of_Clubs_syndicate Added
sc_6_of_Diamonds_black Added
sc_6_of_Diamonds_nanotrasen Added
sc_6_of_Diamonds_syndicate Added
sc_6_of_Hearts_black Added
sc_6_of_Hearts_nanotrasen Added
sc_6_of_Hearts_syndicate Added
sc_6_of_Spades_black Added
sc_6_of_Spades_nanotrasen Added
sc_6_of_Spades_syndicate Added
sc_7_of_Clubs_black Added
sc_7_of_Clubs_nanotrasen Added
sc_7_of_Clubs_syndicate Added
sc_7_of_Diamonds_black Added
sc_7_of_Diamonds_nanotrasen Added
sc_7_of_Diamonds_syndicate Added
sc_7_of_Hearts_black Added
sc_7_of_Hearts_nanotrasen Added
sc_7_of_Hearts_syndicate Added
sc_7_of_Spades_black Added
sc_7_of_Spades_nanotrasen Added
sc_7_of_Spades_syndicate Added
sc_8_of_Clubs_black Added
sc_8_of_Clubs_nanotrasen Added
sc_8_of_Clubs_syndicate Added
sc_8_of_Diamonds_black Added
sc_8_of_Diamonds_nanotrasen Added
sc_8_of_Diamonds_syndicate Added
sc_8_of_Hearts_black Added
sc_8_of_Hearts_nanotrasen Added
sc_8_of_Hearts_syndicate Added
sc_8_of_Spades_black Added
sc_8_of_Spades_nanotrasen Added
sc_8_of_Spades_syndicate Added
sc_9_of_Clubs_black Added
sc_9_of_Clubs_nanotrasen Added
sc_9_of_Clubs_syndicate Added
sc_9_of_Diamonds_black Added
sc_9_of_Diamonds_nanotrasen Added
sc_9_of_Diamonds_syndicate Added
sc_9_of_Hearts_black Added
sc_9_of_Hearts_nanotrasen Added
sc_9_of_Hearts_syndicate Added
sc_9_of_Spades_black Added
sc_9_of_Spades_nanotrasen Added
sc_9_of_Spades_syndicate Added
sc_Ace_of_Clubs_black Added
sc_Ace_of_Clubs_nanotrasen Added
sc_Ace_of_Clubs_syndicate Added
sc_Ace_of_Diamonds_black Added
sc_Ace_of_Diamonds_nanotrasen Added
sc_Ace_of_Diamonds_syndicate Added
sc_Ace_of_Hearts_black Added
sc_Ace_of_Hearts_nanotrasen Added
sc_Ace_of_Hearts_syndicate Added
sc_Ace_of_Spades_black Added
sc_Ace_of_Spades_nanotrasen Added
sc_Ace_of_Spades_syndicate Added
sc_Jack_of_Clubs_black Added
sc_Jack_of_Clubs_nanotrasen Added
sc_Jack_of_Clubs_syndicate Added
sc_Jack_of_Diamonds_black Added
sc_Jack_of_Diamonds_nanotrasen Added
sc_Jack_of_Diamonds_syndicate Added
sc_Jack_of_Hearts_black Added
sc_Jack_of_Hearts_nanotrasen Added
sc_Jack_of_Hearts_syndicate Added
sc_Jack_of_Spades_black Added
sc_Jack_of_Spades_nanotrasen Added
sc_Jack_of_Spades_syndicate Added
sc_King_of_Clubs_black Added
sc_King_of_Clubs_nanotrasen Added
sc_King_of_Clubs_syndicate Added
sc_King_of_Diamonds_black Added
sc_King_of_Diamonds_nanotrasen Added
sc_King_of_Diamonds_syndicate Added
sc_King_of_Hearts_black Added
sc_King_of_Hearts_nanotrasen Added
sc_King_of_Hearts_syndicate Added
sc_King_of_Spades_black Added
sc_King_of_Spades_nanotrasen Added
sc_King_of_Spades_syndicate Added
sc_Queen_of_Clubs_black Added
sc_Queen_of_Clubs_nanotrasen Added
sc_Queen_of_Clubs_syndicate Added
sc_Queen_of_Diamonds_black Added
sc_Queen_of_Diamonds_nanotrasen Added
sc_Queen_of_Diamonds_syndicate Added
sc_Queen_of_Hearts_black Added
sc_Queen_of_Hearts_nanotrasen Added
sc_Queen_of_Hearts_syndicate Added
sc_Queen_of_Spades_black Added
sc_Queen_of_Spades_nanotrasen Added
sc_Queen_of_Spades_syndicate Added
singlecard_down_black Added
singlecard_down_nanotrasen Added
singlecard_down_syndicate Added
syndicate_box Added
syndicate_box_open Added
syndicate_hand1 Added
syndicate_hand2 Added
syndicate_hand3 Added
syndicate_hand4 Added
syndicate_hand5 Added
syndicate_joker Added

Edit: diff updated after 8761352

@Vonsant Vonsant changed the title Add playable cards Игральные карты + механика к ним. Nov 24, 2024
@Vonsant Vonsant requested review from FireNameFN, Tornado-Technology and AwareFoxy and removed request for Morb0 November 24, 2024 18:54
@github-actions github-actions bot added the S: Needs Review ПРу необходим ревью label Nov 24, 2024
@Vonsant Vonsant requested a review from lzk228 November 24, 2024 19:04
@AwareFoxy
Copy link
Collaborator

testi

@Vonsant
Copy link
Collaborator Author

Vonsant commented Nov 24, 2024 •
edited
Loading

testi

Это проблема не ПРа, забей.

@Vonsant
Copy link
Collaborator Author

Vonsant commented Nov 24, 2024

Не мержи, а проверь код.

FireNameFN
FireNameFN requested changes Nov 24, 2024
View reviewed changes
Copy link
Collaborator

@FireNameFN FireNameFN left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В карты подмешалась какая-то броня.

Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml Outdated Show resolved Hide resolved
...ures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/equipped-OUTERCLOTHING.png Outdated Show resolved Hide resolved
@Vonsant
Copy link
Collaborator Author

Vonsant commented Nov 24, 2024

В карты подмешалась какая-то броня.

Забыла почистить перед ПРом, уэ.

lzk228
lzk228 reviewed Nov 25, 2024
View reviewed changes
Copy link
Collaborator

@lzk228 lzk228 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

это максимум что я могу тут ревьювнуть
ещё могу к форматированию придраться разве что

Content.Client/_CorvaxNext/Cards/Card/CardSystem.cs Outdated Show resolved Hide resolved
Content.Client/_CorvaxNext/Cards/CardSpriteSystem.cs Outdated Show resolved Hide resolved
Content.Client/_CorvaxNext/Cards/Deck/CardDeckSystem.cs Outdated Show resolved Hide resolved
Content.Client/_CorvaxNext/Cards/Hand/CardHandSystem.cs Outdated Show resolved Hide resolved
@Vonsant Vonsant marked this pull request as draft November 25, 2024 14:32
@Vonsant Vonsant marked this pull request as ready for review November 25, 2024 20:16
AwareFoxy
AwareFoxy previously approved these changes Nov 25, 2024
View reviewed changes
Copy link
Collaborator

@AwareFoxy AwareFoxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

процедурная генерация карт исходя из колоды, просто ахуенно

FireNameFN
FireNameFN previously requested changes Nov 25, 2024
View reviewed changes
Content.Client/_CorvaxNext/Cards/CardSpriteSystem.cs Show resolved Hide resolved
Content.Client/_CorvaxNext/Cards/Deck/CardDeckSystem.cs Show resolved Hide resolved
Content.Client/_CorvaxNext/Cards/Hand/UI/CardHandMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs Outdated Show resolved Hide resolved
Content.Server/_CorvaxNext/OpenTriggeredStorageFill/OpenTriggeredStorageFillSystem.cs Outdated Show resolved Hide resolved
Content.Server/_CorvaxNext/OpenTriggeredStorageFill/OpenTriggeredStorageFillSystem.cs Outdated Show resolved Hide resolved
Content.Shared/_CorvaxNext/Cards/Deck/CardDeckSystem.cs Show resolved Hide resolved
Resources/Audio/_CorvaxNext/Effects/Cards/attributions.yml Show resolved Hide resolved
runclient - Release.bat Outdated Show resolved Hide resolved
runserver - Release.bat Outdated Show resolved Hide resolved
@Vonsant
Copy link
Collaborator Author

Vonsant commented Nov 25, 2024

Тесты норм, так и должно быть.

@AwareFoxy AwareFoxy merged commit 8178cd5 into space-syndicate:master Nov 26, 2024
12 checks passed
@Day-OS
Copy link

Day-OS commented Dec 5, 2024 •
edited
Loading

glad you guys liked it!

(just to mention, I'm not spanish, as the description states but well that's that)

Спасибо!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzk228 lzk228 lzk228 left review comments

@AwareFoxy AwareFoxy AwareFoxy left review comments

@FireNameFN FireNameFN FireNameFN left review comments

@Tornado-Technology Tornado-Technology Awaiting requested review from Tornado-Technology Tornado-Technology is a code owner

Assignees
No one assigned
Labels
Changes: Localization Изменяет локализацию Changes: Sprites Changes: UI S: Needs Review ПРу необходим ревью S: Untriaged size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Vonsant @AwareFoxy @Day-OS @FireNameFN @lzk228